Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 6 Feb 2010 17:50:45 +0000 (12:50 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 6 Feb 2010 17:50:45 +0000 (12:50 -0500)
commit1ddc8c3f4aecdbc5f572c5441500c3fa1a468a44
tree329a7f88e9e178555f7010c743c5d40fdc359096
parent271912c34b975c813f36a3fdf784efd0b51ca13c
parent73652b1a60a9a16b37b62b683523c8c324afbdd2
Merge from mainline.